From: Olaf Hering <olaf@aepfle.de>
Date: Fri, 10 Jun 2011 08:47:07 +0000 (+0200)
Subject: xenpaging: drop xc.c, remove xc_platform_info_t
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10149
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=305ed55b97fe1950c2a3af93bca8c19d4429e542;p=xen.git

xenpaging: drop xc.c, remove xc_platform_info_t

xc_platform_info_t is not used in xenpaging.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---

diff --git a/tools/xenpaging/xc.c b/tools/xenpaging/xc.c
index f72e4e6e82..754da4cb27 100644
--- a/tools/xenpaging/xc.c
+++ b/tools/xenpaging/xc.c
@@ -26,7 +26,6 @@
 #include <stdarg.h>
 #include <sys/poll.h>
 #include <xc_private.h>
-#include <xg_save_restore.h>
 #include <xs.h>
 #include "xc.h"
 
@@ -97,15 +96,6 @@ int xc_wait_for_event(xc_interface *xch, xc_evtchn *xce)
     return xc_wait_for_event_or_timeout(xch, xce, -1);
 }
 
-int xc_get_platform_info(xc_interface *xc_handle, domid_t domain_id,
-                         xc_platform_info_t *platform_info)
-{
-    return get_platform_info(xc_handle, domain_id,
-                             &platform_info->max_mfn,
-                             &platform_info->hvirt_start,
-                             &platform_info->pt_levels,
-                             &platform_info->guest_width);
-}
 
 
 /*
diff --git a/tools/xenpaging/xc.h b/tools/xenpaging/xc.h
index 38c4cb0867..e554755901 100644
--- a/tools/xenpaging/xc.h
+++ b/tools/xenpaging/xc.h
@@ -34,12 +34,6 @@
 
 
 
-typedef struct xc_platform_info {
-    unsigned long max_mfn;
-    unsigned long hvirt_start;
-    unsigned int  pt_levels;
-    unsigned int  guest_width;
-} xc_platform_info_t;
 
 
 
@@ -47,8 +41,6 @@ int xc_mem_paging_flush_ioemu_cache(domid_t domain_id);
 int xc_wait_for_event(xc_interface *xch, xc_evtchn *xce);
 int xc_wait_for_event_or_timeout(xc_interface *xch, xc_evtchn *xce, unsigned long ms);
 
-int xc_get_platform_info(xc_interface *xc_handle, domid_t domain_id,
-                         xc_platform_info_t *platform_info);
 
 
 #endif // __XC_H__
diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c
index 04d362356a..09db0b4499 100644
--- a/tools/xenpaging/xenpaging.c
+++ b/tools/xenpaging/xenpaging.c
@@ -176,22 +176,6 @@ static xenpaging_t *xenpaging_init(domid_t domain_id)
 
     paging->mem_event.port = rc;
 
-    /* Get platform info */
-    paging->platform_info = malloc(sizeof(xc_platform_info_t));
-    if ( paging->platform_info == NULL )
-    {
-        ERROR("Error allocating memory for platform info");
-        goto err;
-    }
-
-    rc = xc_get_platform_info(xch, paging->mem_event.domain_id,
-                              paging->platform_info);
-    if ( rc != 1 )
-    {
-        ERROR("Error getting platform info");
-        goto err;
-    }
-
     /* Get domaininfo */
     paging->domain_info = malloc(sizeof(xc_domaininfo_t));
     if ( paging->domain_info == NULL )
@@ -246,7 +230,6 @@ static xenpaging_t *xenpaging_init(domid_t domain_id)
         }
 
         free(paging->bitmap);
-        free(paging->platform_info);
         free(paging->domain_info);
         free(paging);
     }
diff --git a/tools/xenpaging/xenpaging.h b/tools/xenpaging/xenpaging.h
index 2d7bead7a0..d99f2bebcc 100644
--- a/tools/xenpaging/xenpaging.h
+++ b/tools/xenpaging/xenpaging.h
@@ -38,7 +38,6 @@ typedef struct xenpaging {
     xc_interface *xc_handle;
     struct xs_handle *xs_handle;
 
-    xc_platform_info_t *platform_info;
     xc_domaininfo_t    *domain_info;
 
     unsigned long *bitmap;